From: Alan Mackenzie <acm@muc.de>
Date: Sun, 15 Jan 2012 19:34:11 +0000 (+0000)
Subject: Merge.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~3390^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=44b0225ed09cfbc6cee7ed53c630988c342df806;p=emacs.git

Merge.
---

44b0225ed09cfbc6cee7ed53c630988c342df806